[automerger skipped] Do not set WFC mode separately when not editable am:...
[automerger skipped] Do not set WFC mode separately when not editable am: 6e5e8259 am: a5a7ed81 -s ours
am: 7c70acbc -s ours
Change-Id: I0a114155bd26d8cbd97aff697f2372cb35fee925