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