Merge "[FUI21] Move scrubSubscriberId to utils class"