Merge "Remove Not Referenced APIs" into devel/master