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

Change-Id: I94a073c6151d19a40a5fea2db5871b6dc970de80