Merge "Fix network availability reporting" into honeycomb