Revert "Add new class with APIs of varying visibility" am: 59292377 am: 905bb825 am: 83cfeb4b am: 7a031623 am: a876f1dd Change-Id: I3dadf345b0363ecedb0ab28b55aaeedffebb4aaf