am 4a13f358: Merge changes Ib1274847,I2eb2a1bf into klp-dev am: 8d08a9bdc7

Original change: undetermined

Change-Id: Iab81652a57b1a2c7a26e66da0b384e9448577968