Merge "Revert "Disable current matrix."" into sc-dev-plus-aosp