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

Change-Id: I7a31ac58e735ee9490c085896de3c184d93d4c70