Update flags

Change-Id: Ic95324be64067379b89cf242b6c2aa5f7aad9a7b