Adjust for flag name change

Change-Id: If8cb16c4e0aee2b2a593035f7045bf9ac1a3fc94
Merge "Adjust for flag name change" into develop