Merge "Eliminate a race condition that could lead to calling PBT#finalizeBackup() twice" into oc-dr1-dev am: 150fec445a
am: 9ccbc85470

Change-Id: I9624a73cf044bf8dce07870045b253063595c0b5