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

Change-Id: I14b5aee33591d74898855beebb0819b2ebc4b96b