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

Change-Id: I19f3eda783e1d58ab5070e882181fe8be3c9514b