Merge "Addressing CL comments." into rvc-dev am: 9bd14c445e

Change-Id: I5b32e751573a8f91433731426fd2f16be7502208