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

Change-Id: I549f9d819b2b48dd7410a92d2d006fa3d9cc512f