Merge "Add Permission Indicator methods/classes to Test Api" into sc-dev