Merge "Add "not congested" network capability." am: ffaddf73de am: abb158f712
am: 1ed2bee762

Change-Id: I836fedeab34f34a43e0257e395fca1f735bc6d61