Merge "Merge "More following of refactoring." into rvc-dev am: 239de5e0 am:...
Merge "Merge "More following of refactoring." into rvc-dev am: 239de5e0 am: 2548324b" into rvc-d1-dev-plus-aosp am: 51c7cc0e
Change-Id: I5a7caaa28cac7a0b855afcd1fac1f63b357161bd