Merge changes I5716db7c,Id83986fc into sc-dev

* changes:
  DO NOT MERGE: Disable current matrix.
  freeze compat matrix 6 for Android S