Add new branch-specific flags am: 82de1d309c am: 388fe820ce
am: e125d5c136

Change-Id: Ifa659f3db0bfddbcd3cc054d7bc88d9d0f633358