Merge "API Review: clearUserDataOnFailedRestore manifest flag"