Merge "Improve change marker for API difference"