utils.expandRestriction helper

Change-Id: I5375f8b805d37f45bb02969096eb04f8bebb0cb6
Merge "utils.expandRestriction helper"