Merge "Replace hidden NMS permission control API"