Merge chips from jb-ub-mail-ur11 into klp-ub-dev

Change-Id: Ied8877d7613ca1dbb5047a0c8c611a1138fc47e3
68 files changed