Merge "Merge "Cellular data stall recovery based on networkStatus" am: 44631dfc26 am: e9dc415e2b am: 58a61cc734"