Use O2

Change-Id: Ia62a6eab936869f7342456b89173c5a7c2ac138b