Merge "Fix issue #28931042: wtf in system server" into nyc-dev
am: 7a1aa92610

* commit '7a1aa926109b090251d193426ba9fdc699e6f3b7':
  Fix issue #28931042: wtf in system server

Change-Id: I84142fe627ae93b680577bff91327419715db4bb