Merge "Switch to "tests" instead of "optional" for build."