Merge "Merge "Fix error handling for non-dynamic permissions" into tm-dev am: 89c545f41b am: b8d6800eed am: 4a5d61532d am: 47a2bea3ac am: f7f7aa0a4c" into main