Merge "Add tests for chooseRestorePolicy."