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

Change-Id: I95642e9c27a3b492096bb92803b85a68023fb492