Merge "Tuner plugin settings updates" into oc-dev
am: eaf6b3b193

Change-Id: If20613b2a78c70b073b00dfc33bd832e3c4b5dc9