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

Change-Id: I2d821219912612a1c00a592f66223320b4d1d63f