Merge changes from topic "am-68be966eb69c42be9da64afcf97a48dc" into sc-dev

* changes:
  [automerger skipped] Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed am: 79d2054b am: 4247c39c am: f62fcf6e -s ours
  [automerger skipped] Remove reference of NetworkAgent#unwanted() am: 705370a2 am: 95d55e71 am: c7fafa18 -s ours
  [automerger skipped] Remove references of NetworkAgentConfig constructor am: a1a61cde am: ddc41d43 am: d4a41a8a -s ours
  [automerger skipped] Remove reference of @ValidationStatus annotation am: 557797e3 am: 1dd354e2 am: cedeb559 -s ours