Merge changes Ibc9b1965,I288ea32f

* changes:
  Fix invalid usage of javadoc
  Add a systemapi constructor for NetworkAgent