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

Change-Id: I9d1ff4c1a73e785664a8729fe810d887dfce0d27