Merge "Fixes for tetheroffload crashes" am: 5ac7a03f9f am: eeb0b31afa
am: 2e290617c5  -s ours

Change-Id: I149fd3f3d542ac0c1c5a2f85536ec0efeec9aed8