Merge changes I98a86296,I2950b566,If51918fd
am: b6e8719350

Change-Id: Ie4f7c5dfb230db92bac021994b9471d8b9fb0bce