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

* commit '6bfc9dd41010c4f17388a35bac071c73183dd220':
  Fix format string mismatch. Clang build fix.