Merge "compatibility_matrix: specify @1.2::ISap directly" into qt-dev
am: 7a605ba87e

Change-Id: Iecc6ad6d1daf9a7cad5948761efa28a7c42f59ea