Merge changes I7839e334,Ie0407f65,Ifa3fb8cf,Icc0478cc
am: 7951d73a4f

Change-Id: I745fdc24cf118a7dadbe377bdfbc281acbbda752