Merge "Limit new special codes"
am: a50c9bd73c

Change-Id: Id20be82d978e7d37611058ee3062aaf995cf0df8