Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev