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