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

Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4