Merge "Address ag/11032295 leftover comments" into rvc-dev am: 1ca44e0dcf

Original change: undetermined

Change-Id: I4121f9c6ed3b51c5ddf8f4a294b23bbf2bfd86c1