am 5c49135b: Merge change 5852 into donut

Merge commit '5c49135b032235f82560d5e55b0e4c547506516b'

* commit '5c49135b032235f82560d5e55b0e4c547506516b':
  rootdir: Modify init.rc to run mtpd/racoon as a non-root user.