Change some variable names to match up with framework am: 779ff5fab7  -s ours
am: f1b195fffa

Change-Id: I5ec7adc45337d3f4545e31aec19d3833ae6c31b9