Convert everything over for OctOS

Change-Id: Ibbe2edbd75f2767cd7b3d84654d857ec49d56d6b