Merge "Cleanup SystemReady in the network stack" am: e0ef7ce4f7
am: 4b130e8567

Change-Id: Id1348ffa1406adf08b94eec18b3b1e6da40e84be