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

Change-Id: I1a1bebfdde2db1eb314dd5ed480281b7540db8db