am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format...
am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev
* commit 'e0e8223c':
Pass resolution to Crypto plugin on format change