Merge "Remove typo'd variables"
am: 72c403b9b5

Change-Id: I5139fad9abddacb4cfe6fb3040ad46c8cf413ed7