Merge "Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e84 am: d00340e1a5" into rvc-d1-dev-plus-aosp