Merge "API: Explicitly track incompatibilities with previous API versions" am: 5f76164a65 am: 5f00bf12f4 am: 285725f7b0 am: f0c2d88a24
am: f6ba471a99

Change-Id: I28a446c4722fbaac5fb0c3a6e7c6a7fe606e13e8