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

Change-Id: Idc369b76ac1b494680cc53b8af42112c00263b98