Merge "Correctly handle empty permissions array in callback" into mnc-dev