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

Change-Id: Ib1416049d9793045e08182d61c22cad65383ffd5