Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev