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

Change-Id: I98886400d789a5dc5903dbe50502cc84e835182b