Merge "Removed usage of hidden APIs"
am: 8a1aa42d70

Change-Id: I3fe5fb2f679c94a074e3c72402f6d841927648a1