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

Change-Id: I7e45331741493ec5269a94b87b7d085b5653b735