am 9ec4cb80: am f813da2d: am e26ca55b: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."

* commit '9ec4cb80658b67e6fe95917cb9a1f697546beb13':