Update flags

Change-Id: Ib897ca9e65c922bcaae6ba8af6715142314695a9