Merge "Revert "Add new class with APIs of varying visibility"" into rvc-dev am: 582cb388 am: ddbbd3df Change-Id: I8ecf8d617bda4a6253b8254baa425c9b98bfa600