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

Change-Id: I90c699160b58a233c8db189c919c37fd6520a943