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