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

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