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

Change-Id: Ic9420e057d739c56fa34381682239bd07be0f49c