Merge "API_History.java -remove the thrown exception"