Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229
am: 2169197e28

Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a