Solve conflicts of Optimus G bringup