Stable flags

Change-Id: Ic5ba15cf37f87b5ebd72e899194f05e563ee4536