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

Change-Id: I50d48ddc0d41b73bf06507c993a1f672827b895e