header cleanupChange-Id: I4e169911591c56e91c301c5cb0bb3ea2d8140cf2
New sources layoutChange-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9