Merge "Improve change marker for API difference"
am: b068c87c89

Change-Id: I293ba4646e07090a4adca860100c1d87df6f2f91