Merge "Controls API - Adding service impl"