Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev