Merge "Fixed possible NPE in ResourceRequestBuilder"