Merge "Add missing declaration, remove unused declaration" into tizen