Merge "Adding 4 standard short codes required by Android Constellation" am: d00de318f9 am: b7e104d0a3
am: 97151608d9

Change-Id: I3a20927372095ff9fa3e903681806454f4775568