Merge "[framework] rename some oemCallback and fix javadoc typo." into main