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

Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b