Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev