[automerger skipped] Merge "Replace old no-service resource with new one" into...
[automerger skipped] Merge "Replace old no-service resource with new one" into qt-r1-dev am: 1d9e3634
am: ddafed69 -s ours
am skip reason: change_id I6bf57c61c2b0fbce9d2bae8c3f3870ae1aa716de with SHA1 15f98329 is in history
Change-Id: I810d313dc099f8b8a321de9d3018c47be5f988dc