Merge changes I41ddfc48,I0fffc870 am: e80e224395
am: 3c96deb022

Change-Id: I5cf96e70f5ede805471828f3750a5b0f0f2a91cc