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