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

Change-Id: I03576533b34a92d87ae3f9c7bd106084ad8d66aa