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

Change-Id: Ife3f799d3eae2a032a4391443a64eeb55bebb1fa