Merge "Check for IControllOffload.getServer() returning null" am: c5932ab2a8 am: a3658b0fc2
am: c9fad76673  -s ours

Change-Id: I4ea32048fa59dcaee62a30f57e9f318b7013f0c1