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