Merge in history of cedf84d35ab127dd24f9bcbf8b8339518d0e8928 into klp-dev. am: 9b9bd69b65 am: 819a7faca7 am: 744e305689
am: 055792d0b8

Change-Id: If4599f763123484e407e919355d42eb158c68a2c