Merge "Improve variable naming and coding styles" am: 45e5cc7a57

Change-Id: I51754593968c1a658ee0b9ac655741a55b6ea297