Merge "Remove typo'd variables" am: 72c403b9b5 am: 08990a465d
am: ef366983e4

Change-Id: I5542ec7e213175af2a0eccb19173ae863eb73368