Add new branch-specific flags

Bug: 122316490
Change-Id: I7a4f65dd075f80624d769f632f7d80deb40abb05
(cherry picked from commit ce66ced5220d04aadd0545525a532b44d14f81fd)
1 file changed