am a4c88ee9: am 1b94df8a: am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev

* commit 'a4c88ee991e452d0adbc3a5f1bcdc00a68afcc77':
  Framework side of issue #7302511: GCM client needs to use new framework API...