Merge changes Iff1ec14b,I32123c51,I517dbcba,Ic215c7fe
am: b9b967e2fc

Change-Id: Ia0c1c07dcc2ddfae072cb43a20960efe0de7e951