Merge "Address ag/11032295 leftover comments" into rvc-dev am: 1ca44e0dcf am: 9783676439 am: d494516ade
Original change: undetermined Change-Id: Ifd296a8e9e1a9f686535c7e6a6257f6a9c879831
This commit is contained in: