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

Change-Id: Ib17b53a72e737a7b584c65b63c89bd7524c1a2c4