Merge changes Ic94024e8,Ib1276336,Iaf052e2d,Ic951a6fc,I8e6f16cb, ... am: 7b6dd6cf9d
am: b4ed6b6784  -s ours

Change-Id: I52ba8bd7832ad2a9af0a32103e6a2eddf8b44cc9