Add new branch-specific flags
am: e961f1818e

Change-Id: I8f4aaa8d64c7415824fdb111d51df554aa6460d8