Merge changes Ida58d13d,Ia9441cc5,Id840983d,I73611593 am: 0d1d773d54
am: 3a5f6f2422  -s ours

Change-Id: I76f0fa446cf53476b4778d88285eb6db13ae0e25