Merge "Fix issue #28431297: Crash in system process" into nyc-dev
am: 1a2f993

* commit '1a2f993ba5a81899500b989683364708025e13a5':
  Fix issue #28431297: Crash in system process

Change-Id: I46aec10a524e6864b414d12bb2a79bc24d8b47ae