Merge "Fixed RunCommandDropRoot when running as Shell."