am 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1

* commit '46685db957cc01cef4ba198aafe44d99fe31f62c':
  Fix crash in existing applications Bug #5659476