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

* commit 'e96bf3ccdd8b338daf283d55c7233daddec6cf56':

Change-Id: I659403aa286d0498316ba32c5d942ac17c16fa1b