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

* commit '490e81a7b32f92de40debd62122dd3c793dc52ec':
  Merge chips from jb-ub-mail-ur11 into klp-ub-dev