Merge "Controls API - Add support for routines" into rvc-dev am: 780782b750 am: d4b46970a9 am: e03362ee51 am: 034794f4a2 am: 19095d4e2f

Change-Id: I27682a07a9ec4fe6e100d276cb34b110618d78ed