Merge "Debug message fix" am: 15418261cc

Change-Id: Ief60bab235ed796541675acc46428b07dfd6c7b2