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

Change-Id: I89fc058862892c8a374634a4456bff8d41537ec4