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

Change-Id: I49a803f8ecadfab53a686c91c601aaead8a1c81f