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

Change-Id: I2bccc8eb4829e6bc4f3f3d4e246eeb0027378987