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

Change-Id: I0196a9f1da64efd6a811139bb9d2de7e39defe11