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

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

Change-Id: I0b15977a1b4e79743a6fe6937cd3463a4e3c2c3c