Update ignores and sync to r31708
using theirs
Update ignores after resolving conflicts