Merge "Addition of 'XorEqualsString' method for comparing String" am: e750b5b659
am: 000baa69f6

Change-Id: I1f85966f9a430e78e784b527771f4b5ce80e5289