[automerger skipped] Merge "Add unit test for isEmailAddress" am: a9cadb25...
[automerger skipped] Merge "Add unit test for isEmailAddress" am: a9cadb25 am: 0f172cf7 am: b1dc0cc8 -s ours
am skip reason: Change-Id I9475fda33bde65d2f6bbef69501bd92a0d664b39 with SHA-1 03a25ab3 is in history
Change-Id: I52518ec964e6af3106f79b84e439855fac59e4cd