Merge "Use per user info for seinfo" into pi-dev
am: ce5f2b3e87

Change-Id: I01dbd963e683fac472a58d6610fde40dc6fb79f2