am a7bf7c2c: am 8188f826: Merge "Multiple fixes to CMAS app." into jb-mr1-dev

* commit 'a7bf7c2c4afc80f55aa339d547118086aeedbeec':
  Multiple fixes to CMAS app.