Merge "Adding 4 standard short codes required by Android Constellation" am: d00de318 am: b7e104d0 am: 97151608 Change-Id: I3a20927372095ff9fa3e903681806454f4775568