roomservice: Allow following up tag references

This is now needed for release builds

Change-Id: I8c5f87341059b3b15ee853312b71df73790ad0d8
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD