Merge "AAF integration in Policy SDK"