Merge changes Ia0623d38,Iaabd5d8b,I579bb12f,Ia9930edd am: 2b1357fe90
am: e9e84a1dca  -s ours

Change-Id: I25e1264c880dbc54f5e67ee98eac566bbdf4536b