Merge "Fix security vulnerability of non-dynamic permission removal" into tm-dev