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