Merge \\"Enable profman pretty printing\\" am: 06fead330f
am: 9ea2fe1be6

Change-Id: I04490095047c4f3384f17f0237c8cebfe3b64203