Merge \\"Change prefix based upon mask\\" into nyc-mr1-dev am: 1dffcfdd7b
am: 322bb3fd0a

Change-Id: Ib2a7aee7e2d2dd7195a7a4d4e7c8c0b03885d25b