Merge "Add oof-has-controller dependency on aaf-sms"