am aca6527e: am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev

* commit 'aca6527ed6d7b27ca80c0b8d8be8928df597a951':
  fix crashing apps