Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
am: ec02583438

Change-Id: I5a57a9fd14dc53eaf1722fbc9a972f4f73280497