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

Change-Id: Ibacb6e0ed479e61106a263575a336413c84670f5