Bind more services to localhost

Change-Id: I4d5d083f167c06dca843ee4624f0c970a292e3e0
Merge "Bind more services to localhost"