Merge "Generify variable name" into rvc-dev am: f0059d21c7 am: c4831de976
Change-Id: I72f087b561658e604d788ed76cc73ea2185e1eed
This commit is contained in:
f0059d21c7 am: c4831de976
Change-Id: I72f087b561658e604d788ed76cc73ea2185e1eed