Merge "reduce the visibility of framework-minus-apex" into rvc-dev am: e06e29bb am: 9138b8de am: 27f11d77 am: 7c619784 Change-Id: Ie853ddbd7eafd99992821b720e5934f1be177c0b