Merge "Use who when requesting permissions" into mnc-dev