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

Change-Id: I69d8504f8487218f14faf4f35b5307c396f9cb4f