Merge "Move profile test to text format" am: 6a21550aaf
am: 1b3c2dc455

Change-Id: I5b73054194503c71a7938aa1a14f56f93db4e99a