Merge "[HOLMES] Remove AAF dependency and support SM"