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

* commit '3f840c8c3c1c53f046f6d187b2d3c4120b8d8afe':
  fix crashing apps