Merge "AAF_CM.java -remove the exception"