Merge "Add GCM. Required by 20150424 backports."