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