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