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