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

Change-Id: I1bb361f0f4ad610f5553d2dd6a4866f44f41356e