Merge "Merge "Enable profman pretty printing" into nyc-dev am: 572e23d761 am: 09c6c75d24" into nyc-mr1-dev-plus-aosp
am: 6df66b090b

* commit '6df66b090bbae6ac75ffcbbeaccb9036af2c471d':

Change-Id: I39f3c902c583e18254857aad4204527cf19a899d