Revert "Merge changes Iadc9610f,I279593ac into oc-dev"
Bug: 79775396
Test: sts-tradefed
This reverts commit 14d60bee, reversing
changes made to 5c0e4936.
Change-Id: Ia78b02a253ac53cb465ec7b7aeffdfc06ac89247
(cherry picked from commit fca526193b22093cf1b959f21ad3c6c323d9b8b1)