Merge "Re-unite sources with their headers" am: e43444a00b am: 946d11d216
am: b365b0db93

Change-Id: I5cbc54ea69e627a286fa1a2f855102146c3e044f