Update flags

Change-Id: Id3d511de655b4229617a711f4a28c018ba551284