Revert "Add octaviav2"

This reverts commit 97ac04e8d4e815738c729b9bb4636d4e87de3c57.

Change-Id: I62890574e3cfe7937d70ae675bfd15b791bc0acd
5 files changed