Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 9a3e97dcf5 am: e0416f73a2
Change-Id: Id5d3b8db534b95e959b66c92382d5db90be26e8e
This commit is contained in: