am bf6d1ebc: am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset...
am bf6d1ebc: am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit 'bf6d1ebc':
Revert "Make VPA.setInterpolator(null) unset the interpolator."