Merge "Adding 4 standard short codes required by Android Constellation"