Merge "Controls API - Add support for routines" into rvc-dev am: 780782b7 am: d4b46970 am: 242e1857 am: 32997664 Change-Id: Iddf4564c7b97e5ed524dcac041316ab0284dca50