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

Change-Id: Ic90b76025387c28c04ed10a68c07d76b6a4f24a3