Merge "Replace old no-service resource with new one" into qt-r1-dev
am: 1d9e363404

Change-Id: I2d45077cb88d7bde5b9726fde9730bc0f094e0aa