Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 8dec93cb18 am: 8c51fafe8c
Change-Id: Iba577a4056709e20d1a74f9197e99095925e11f0
This commit is contained in: