Merge "Revert "Add new class with APIs of varying visibility"" into rvc-dev am: 582cb38829 am: ddbbd3dff7 am: 71add83fb2
Change-Id: Ibb8bab40eb324d1ad22ccddaf177a1f904b604ae
This commit is contained in: