Fix string equality comparison am: 1033c6fdbc
am: fdd4fe53cf

Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340