Merge "Assign a new future before calling update()"
am: ab761288e2

Change-Id: Iab1a8600000bf36c117b05a82ad1986cbd0f48fa