Merge "Add tests for Recovery Controller Parcelables"