Merge "Move profile test to text format" am: 6a21550aaf am: 1b3c2dc455
am: 978fb05b59  -s ours

Change-Id: Ia23b2c3287023ec2f0622f4ba00fb4bd2eceaded