Merge "Use public alternatives to hidden APIs"
am: 5cffd2e2be

Change-Id: Ica768c129acf34ec285b27c747f61427a95ae8ac