Unify person entry and beautify syntax.

We should not use personalized person enties.

Change-Id: Ifaf966192fce0ced0d60d7bf2ab2a2712701e77b
Merge "Unify person entry and beautify syntax."