am a2f4c254: am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode

Merge commit 'a2f4c2543a7f78b77491c701230e8f406dcca540' into eclair-mr2-plus-aosp

* commit 'a2f4c2543a7f78b77491c701230e8f406dcca540':
  Fix issue #2249821: Unable to start passion in safe mode