Adding everything at the end makes the list arbitrarily ordered, and also invites lots of merge conflicts as new things are added. Change-Id: I58bcca4fa79140f5d5f2f6ef447e67035cc37aae