Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev
am: 15f75d0422

Change-Id: Id14d38f22f91c68682acdb3572c07a6e57780b03