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