otter2: Dedupe flags

Change-Id: Ibec2f3b0e2d8e2d42a45ddb5596faa4c5207854e
Merge "otter2: Dedupe flags" into cm-11.0