Made background updater more robust to state changes am: 9bfba9c157 am: 37b0ccf303
am: 365d80d384

Change-Id: Iec3443791acafc77644d73ddadf66561f17d2b16