am a21a6075: Reconcile with jb-mr1-release

* commit 'a21a60757d7e589ade83129f42aadc019f1d5aa4':
  Fix permission issues for apps