Merge "Add more NonNull annotations to RecoveryController API" into pi-dev