Merge "Minor change for async DNS API" am: 80be1b1127
am: 73b82e417b

Change-Id: If69e95dbb3cba98af84079506d898350f812a7de