Merge "Allow tests to be disabled for presubmit check"
am: 4c7d849a1b

Change-Id: I0bf781e9ea13c7325b35631e369834acf47d3c77