Merge "Change format of dump resources log headers and footers" into tm-dev