Split octaviav2 state

Change-Id: I10637d62440bf102c72a81d097e8b759f9aedce7
3 files changed