Merge \\"More correctly close RA daemon socket.\\" into nyc-mr1-dev am: 09d4f4fda4
am: ec2748e316

Change-Id: I83a33ae546003fb3fe76f7ad9fe251f188ed00ba