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

Change-Id: Ibb53c5175e1d4e1851688a48e87597d662044331