Merge "Controls API - Add support for routines" into rvc-dev am: 780782b750 am: d4b46970a9

Change-Id: I3fd55029e4de113c385112b4c89c91aea1da12e0