am 369823b2: am fb48b014: Merge "Fix format string mismatch. Clang build fix." into mnc-dev

* commit '369823b26dac39c90e69de46c2efef921ffc064b':
  Fix format string mismatch. Clang build fix.