Improve variable naming and coding styles

Bug: 151708408
Bug: 149273649
Test: manual
Merged-In: I035ba012deab32cb9273579847794b959e93a2c1
Change-Id: I035ba012deab32cb9273579847794b959e93a2c1
3 files changed