Fix personas due to new services.

Change-Id: I2e70dfa090a3b81070c124cbf89e82c818c7aba2
(cherry picked from commit 4f682ab484c593b94ac459ff5bedaa16f7663f33)
Merge "Fix personas due to new services." into stable/grizzly