Merge "[Manual] Fix local variable names"
am: eb60d9eb3d

Change-Id: I266e9afd552bc4e158cc906a005a073a36eb01b3