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