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