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

Change-Id: I4c6db8e0ff4d317ad349ad95cf5fca909ee985fc