Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b
am: 700c72d01d

Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916