Merge "Check for IControllOffload.getServer() returning null"
am: c5932ab2a8

Change-Id: If27fca9aa594af2f58a470709d78f19f31bb316d