Update flag settings

Change-Id: I62e72a6f863f5ad147ae8c3c1fc3e94c6d7c646d