Merge "Removal of usage of hidden APIs" am: 78b20d0d58
am: e8eefec918

Change-Id: I18dcc160df4d90d193d80f9bbd96e954699efb8b