Merge "Handle NPE by using TextUtils.equals" into tm-dev