Merge in history of cedf84d3 into klp-dev. am: 9b9bd69b am: 819a7fac am: 744e3056 am: 055792d0 Change-Id: If4599f763123484e407e919355d42eb158c68a2c