Merge "Removal of usage of hidden APIs"
am: f6ab107105

Change-Id: I9cd899c58b9438641f47800b29fd78e7f3966415