Merge "Remove non-touch related deprecated APIs" into devel/master