[automerger skipped] Merge "Renamed the variable" am: afa94f4664 am: f2a8ea192c
am: da5ed35119 -s ours
am skip reason: change_id I4deb1271818019465c55b59cd4a4a8029b514697 with SHA1 1746d2582a is in history

Change-Id: I9906f4cd11e47e45e6b3043b8c7510173f3e7a6d