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

* commit 'e0e8223c10e051b73fdcbed4fc67a69df2655c56':
  Pass resolution to Crypto plugin on format change