Merge "Remove usage of deprecated APIs" into devel/master