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