Changing flags again

Change-Id: Ic1e8199865475115e770759dbde03ed5a029ba99