Merge changes Iea1d2ae2,I1d3c8e48
am: d708ea7b4a

Change-Id: I93f166312563139a99a0001d4ab83d0c0064368e