consolidateallthethings

Change-Id: I502105caef9a602c12229848b91bbce1f97cb20a