Merge "Fix wrong variable reference."
am: 68e4f49c06

Change-Id: I9874f16070b9f596e3f807254796c24d3a3dbdfb