Merge "Simplify system or active user checks"
am: 6062a2d0fc

Change-Id: I4f99330c8e2c3fe3370cc412e745748b93a01119