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

Change-Id: I2e381e9215a2d8f036a0de4f021573688250c142