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

Change-Id: I0d4427a0063fad72b525ac2db0392693f5ec446d