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

Change-Id: I89cad759968e85be00cbb6014aec6cb76260e6b8