Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev