Merge "DscpPolicyTest: increase timeout to wait for global v6 address"