Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8
am: ed268dc350

Change-Id: I202bed758385f4918452d78dfef42682521132df