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

Change-Id: I37ed24484e5f152eecdd0f334619a8d0b267de8e