Merge "Fix setFlags/addFlags typo" am: 9a530c3704 am: 4d25ef04a2 am: 00e67f1c97
am: 1b4eebcff6

Change-Id: I580afda625d1a64bac5ce4c587e65bbf35da1b0e