Use .equals not == for comparing strings

Change-Id: Ief36183409d91475eb052eae4dc18d1edfd8f54f
Merge "Use .equals not == for comparing strings"