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

Change-Id: Ic554b87d819c3396530bad1dc5360b9067601319