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