Merge changes I2dd58db1,I6cf55ad4 am: ecfba0c358
am: 4c092349ce

Change-Id: I40aafc4b85c9a982ca51bda085c60e6ce8c5a039