[automerger skipped] Rename variables and methods specifically am: 5abdc91e...
[automerger skipped] Rename variables and methods specifically am: 5abdc91e -s ours am: 67557210 -s ours
am skip reason: Change-Id I646b4b58df20d1a280c0f472b4573dc350349cc3 with SHA-1 5abdc91e is in history
Change-Id: Ibb64dba371c5753b65824c6f434c4208497a00d3