Merge "Move AOD NIC binding to external locations" into main