Merge "Client certificates should only be set on request from server" into dalvik-dev