Merge changes I52ec5b02,I376656e3,I3f005583,Icba4e33d,I78400f6c, ...
am: d7a1506715

Change-Id: Idd3ab59ad99c450d89fd47aaa1a15681f73175ac