am b67ca78d: Merge "Fix one flag setting bug"

* commit 'b67ca78d97f775cfd5b37e9a63fc708fd2897d01':
  Fix one flag setting bug