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

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

Change-Id: I24ca8dbb0f9935651fbeaf84b58407eb05abc064