Fix personas due to new services.

Change-Id: I2e70dfa090a3b81070c124cbf89e82c818c7aba2