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

Change-Id: I1fbd1101a8a44b7c56c286b037af3b51c1ee7c80