Flags

Change-Id: I6d090648fde861cb8c4fecac28aade1e4c937dba