Make DataUpdateClosure resilient against exceptions

Bug: 64604
Change-Id: I344a2eb1d077ed324a6d7b93ef0533e18c8d0337
Merge "Make DataUpdateClosure resilient against exceptions"