Fix error in HandlerFuture implementation
am: 50ccbfd94b

Change-Id: Icca28b59a1966db0b11db7b6927065e74eb54ad0