This will be needed to refactor user restriction handling. Change-Id: I4b77a020d631714e7f94bce5559190e3b78ec72c