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