Merge "AAF Sample CA change"