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

Change-Id: I7a84ceef6d7942f4ef915b27661878bede57ace6