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

Change-Id: I1d16a12b84b9e20565bfd07dccb0c93f68d82a40