Fix string equality comparison
am: 1033c6fdbc

Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545