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

Change-Id: I81d1791744a419b1f0a38559335b83bab3b80512