Merge \"Initial profman support for verbose dump\" am: 6c54dfb86a
am: 80ad6c3d95  -s ours

Change-Id: I03eeb0b425e9fe450405a1ebda4e5877541591dc