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

Change-Id: Ia7cc144f3d14cd8d94ee584fb3fb06e1dd01edb8