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

Change-Id: I45b45b975ab0dafe0662b1aa54bac31412bdf461