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

Change-Id: I94bc7fa7f68eefd8eae5d33689cd9d6983669df7