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

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

Change-Id: Ifc7c884f7fe54f4b4d9d0769c1a0af1b9f6f2e0b