Merge changes Ie4313c7a,I0f40b1f2 am: dc4585cbfa

Change-Id: I2679a03e8f3364c7f0bc517026db9145575a9e47