Fix string equality comparison am: 1033c6fd am: fdd4fe53 am: 3fbe9280 am: bf4f010a am: 700c72d0 am: 5d60d2f7 am: 62457749 Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131