Merge \"QS: Fix default icon handling for services\" into nyc-dev
am: 94a20367b5

Change-Id: I20510a1397c304695596e4e8315d3cb428d26a74