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