Use equals() to compare String's

Change-Id: I7f9ec954265ef1771e6f4ce66788f5d464b25505