Merge "reduce the visibility of framework-minus-apex" into rvc-dev