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

Change-Id: I703b8b4cbcf810615946e7ef5bd4c6690ded8674