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

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

Change-Id: Ic42f1fbaff38f96f5215aa959a5bad209052eba2