Merge "Fixes for tetheroffload crashes" into oc-dr1-dev
am: b71e5377f2

Change-Id: Id1037d22826f4d426bccfa17dce0962c54518d64