Merge "Add Vendor Configuration for HOST_WHITE_LIST and DEFAULT_ROUTE"