Merge "Add proper interpolator to controls" into rvc-dev am: 921e64cf am: 91645d8a am: bdd2782e Change-Id: I745e5b62811237efa8e22fd97ed83a54fdd72679