Merge "Add project ID constants." am: 529605bc9e am: df4f865d7a

Change-Id: I6bc3a58b35d13975545ebfa9dc75d69bcae132c7