Merge change 20853

* changes:
  Add net type to mobile for mobile-required traffic