Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev