282f093533
refactoring naming for instance variables to be more in sync with java codestyle Test: presubmit Bug: 278291850 Flag: not needed Change-Id: I24eb1433941b44404871b305acf0d2d145662080