Merge "Tuner API: cleanup. Resolve TODOs." into rvc-dev am: 6e72e16da1 am: 8411095d5f

Change-Id: Ia1c5b6b64be360124a7a95ff07b45544965df8f0