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

Change-Id: I392117bff410a36f797af6f3e2cc267817b8bf6b