Merge "Migrated to new Person API" into pi-dev
am: def4ab55d4

Change-Id: I982c6fdebaeed5d222cd6ab2074ac3dee6893c2b