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

Change-Id: Iebc2946e5705cfda16f44cb468804c2be385c02a