Merge "Fix regression in assist data fetching and canceling" into pi-dev
am: 5513302b43

Change-Id: I7c4e6bf2b66455f39ffff95f49dbffcf2b289b74