This option was deprecated in 15.0.0 and not even used. Change-Id: I4b2b5e7ef3466cab129a59fedf7c339f1689b563