Merge "Controls API - Add support for routines" into rvc-dev am: 780782b7 am: 41245fd2 am: 98bfffe7 Change-Id: Ic051fe74f5dd1c984450751373e8cd5ec8f6bc4f