Merge "Wrong variable being printed in ALOGV statement." am: f8248731ab am: 1c48df531f
am: 1a7b396a0a

Change-Id: I8f7068f6345255b8d138f30306e65402fd885011