[automerger skipped] Improve variable naming and coding styles am: 414d7e5262 -s ours

am skip reason: Change-Id I035ba012deab32cb9273579847794b959e93a2c1 with SHA-1 5049f4d95d is in history

Change-Id: Ib304b155a2b55f7229a6c7c1df56344bdbe9b494