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

Change-Id: Ib2d1862367145260ac83f14d181646eb827538f8