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

Change-Id: I7af4a6ae45cebd6379e271c4310c37fc7e1ff30e