Merge "ListActivity,Rename.java-removing the useless assignments"