Set O3 as default also here

Change-Id: Iab039fda97dac596facd6204f7c959d09d3d5ffa