am ec771223: Add support for common encryption

* commit 'ec77122351b4e78c1fe5b60a208f76baf8c67591':
  Add support for common encryption