Merge "Fixing a bug introduced due to refactoring var names" am: 8cf185e542
am: 68725eee80

Change-Id: Ifb37d59fc328997c631b9cc239b75e49ecf54f6f