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

* commit '8188f826ab8573d3c08566c61d0708f465115a78':
  Multiple fixes to CMAS app.