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

Change-Id: I95a1d2c4bd7092b9bf78190049289a10dd748a53