Merge "Update test profile to new profile version." am: f1387dccd1 am: 3b775581ad am: bf1907bcb0
am: 16b9e05834

Change-Id: I668c2c1604df1383a2d3fa65b8f5a4354e4c3c06