address gerrit comments

Change-Id: Ib5f872bb862b275a5b5eaebb51af171cd91f181d
make handle_update handle update

Change-Id: Ic4bb5c51cb0dec52c323b8eff88ae2da00ffa520