Merge "Made background updater more robust to state changes" into nyc-mr1-dev am: c6c45d225c
am: c1d0f2a316

Change-Id: I16ec12bbf666ed14a50ccde2ce6bb3455f2b50c8