Merge "Increase AdoptableHostTest timeout." into nyc-dev