Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437
am: 537535c14a

Change-Id: I0f9c27f32518f9c7bb1d3735741843178fc1dc02