Merge "Clear the resolver timeout when setting default __res_params" am: 817f578b am: 02f85ccb am: 58f4a157 am: 1629545d Change-Id: I93aef2ac2565124486e7899d614c8ea007382b90