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

Change-Id: I50776e3406b0aa6606a617bba05bb1170919dce0