Merge changes I9b77c105,I0b369d16,I59602c20,Iae4f3d55
am: 95a3916ef9

Change-Id: Id51210d30fd392e1f5b589a1a190808d6ab10300