Merge "Update config file documentation and examples for network type propagation" am: bfd44b60ef
am: a414bf1691

Change-Id: I86789fdd45ebff23fa6020c0fa702d06908d3d67