Merge "Add SmallTest for presubmit"