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