(no ticket) ONTAK controllers

Change-Id: I36569bf462087e7a9643ad7b2b6ddf93f04ae99c
Merge "(no ticket) ONTAK controllers"