fix Os, O1, O2 and O3 selection

Change-Id: I19a264cab0bf92c48d2d900104aa62ac2b85f795