Merge "Revert "Revert "Add presubmit mapping to test apps.""" into sc-dev