[automerger skipped] Explicitly track incompatibilities with previous API versions am: 2ffa847904 -s ours
am: 67c1045c5e -s ours
am skip reason: change_id I3d9e78357f4d91b702d321eb1ce1e71bb90e478b with SHA1 6c5e17e3bf is in history

Change-Id: I53ea93403c092f60f3d604515b3b5216b4122edb