consolidateallthethings

Change-Id: I9cf60882aaa14435d20fa827b5d2aa28c96b00bc