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

Change-Id: Ieb8608ad7c629643f6f30d470a1e7a1c6f70aebc