Merge "More following of refactoring." into rvc-dev am: 239de5e089

Change-Id: Ibf68b22a2b5d78bb562923274ece9f6f3ca0dcef