fixup opt

Change-Id: I11b6b24e3aab036264606cc56b8cc5fcc36a9ece