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

Change-Id: I2211afe2ecfef47d2177c28f16a682dd3334bcfa