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

Change-Id: Ic65e4c04a1dce2580aa2a9b6b57dd0e02d730cbc