Merge "Improve documentation for NetworkCallbacks." am: 90a84e26bd am: cf03f69025 am: cbdc9a1e48
am: 8ec5f5b53b

Change-Id: I9a6eb4841c29e6e6944e3bb6eeb036f8026db4cf