am a31cda89: am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev

* commit 'a31cda89957cc1f29ae1b97a7fadf0266b7ae7b1':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."