Merge "Controls API - Add support for routines" into rvc-dev am: 780782b7 am: d4b46970 am: e03362ee am: 034794f4 Change-Id: Ibb53c5175e1d4e1851688a48e87597d662044331