Merge "add rebootWipeCache call to RecoverySystem API"