[automerger skipped] Change class and variable names am: 49ceee40 am: 1e0ce349
am: 0b058086 -s ours
am skip reason: change_id I868e403ff87e81a64203f27b4203ae42c3e109c0 with SHA1 789492de is in history
Change-Id: I6371d00d57f5f1c2d3a992605abd2909b6ee4b57