Merge "Removal of usage of hidden APIs" am: f6ab107105 am: 604694740f
am: a472788592

Change-Id: Id68ae7a2e4459fa4f2bd37aff612c09a3cb9a92f