am 0c8f9ac7: am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev

* commit '0c8f9ac7cb24ce655e660096332605138ec70542':
  Merge chips from jb-ub-mail-ur11 into klp-ub-dev