am 49318631: Merge "Don\'t use implementation-defined format with CPU consumers" into klp-dev

* commit '493186312a9a8c0215da0d6d3a9b0369491c0796':
  Don't use implementation-defined format with CPU consumers