Daily dose of -O3

Change-Id: I9eccbba1d96b691dece8e1beebf347b33e4b6ad5