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