Merge "Revert "Add new class with APIs of varying visibility"" into rvc-dev