Merge "Limit new special codes" am: a50c9bd73c
am: 7a41c153b5

Change-Id: Ib2d957317cfa0c547b76bc76dd0f80733d043a31