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

* commit '312ce849449e50a600f457b26ddf424cdc0bdaba':
  Multiple fixes to CMAS app.