[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-ub-dev am: 15f75d0422 am: ce9a76f40c am: 0640937bdb

Change-Id: Ifce752f0511ce8fc5d16f79f682063109b8bee37