Disable this option too.

Change-Id: Iec4925afb03b81d0b4d9fe912c8f20b135ef74d3