Merge "Cleanup SystemReady in the network stack" am: ff23b6dce0
am: c1e58995da

Change-Id: Id1348ffa1406adf08b94eec18b3b1e6da40e84be