This flag was deprecated in a previous cycle. The flag and any uses of it can now be removed. Change-Id: Ie26f34b4f435eeb378b88f0c48f844b511696eb9