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

* commit '2501220e1f473752b5eadc663f7486668e9b9fc6':
  Fix issue #28431297: Crash in system process

Change-Id: Icae0787b41e5c47339496e0c08457e331e37162f