Merge "Fixes for tetheroffload crashes" am: 5ac7a03f9f
am: eeb0b31afa

Change-Id: I58c467be3482e01f84c9860e2b9d4b03713c1dbd