fixing up  a couple of incorrect variable references

Change-Id: I3df5ec7a60fa936a1b2e548ab2f04fc14b6c8cc5
Merge "fixing up  a couple of incorrect variable references" into production