-O3 optimizations

Change-Id: Ic0f45ca305ed63288d7eaaedd50dc491b2a36f66