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

Change-Id: I0bc3c4d474fa5f959bd5ac57ce5582d644215563