Merge changes Icd871654,I7c70328d

* changes:
  TetheringTest: verify onUpstreamCapabilitiesChanged explicitly
  TetheringTest: demonstrate duplicated upstream change event