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

Change-Id: I843c154934a078c743ebda0677b648a7e8bc6cb4