Merge changes I44289a3d,I0537453b,I23a655b1 am: 7928afb83d
am: b6650076ad

Change-Id: I11596ccd4816c7558c3a82c7959b10bc5b183a59