Fix bug with flipping XOR

bug: 30969753
Change-Id: I4742ca76292c58291624362ca7c9651e5500292d
4 files changed