Merge "Change some variable names to match up with framework" am: 62d23fbeae
am: 69cc622002

Change-Id: Ic2151541bdf9300c1d7f99d9e947816b1f4f0cbc