Using add/replace instead of update when updating an entry.
am: caa52918f1

Change-Id: I728322245f07e0bc87e8a0726a22932f57248500