Merge changes Ic6b7ff98,I634b9bd4 am: d3c031d842 am: c5b03fb423 am: 716f1669c6

Change-Id: I2e6903503f99d131b57d928fb04ee0d5421e0897