Merge "Update network topology to aai"