am b021358d: am ec771223: Add support for common encryption

* commit 'b021358ddba63e81d6b59f2370e891c71f14f630':
  Add support for common encryption