Merge "Fix format string mismatch. Clang build fix." into mnc-dev