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

* commit '8aad0386145df5a11cc9140a4b7e8d4588e64aa5':
  Fix issue #28431297: Crash in system process

Change-Id: Ibfe02253fe0a4d4981680e58de4d90422e05c9e0