Merge changes I0527ef62,I0d66a93f,I528ef380,Ia9140851,If1874867, ...
am: f9bd812ef0

Change-Id: I1a315eef3e253547a652c222dbaa7607e2b3ae6a