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

Change-Id: If8478eea266decd897382fe1e6efffa23f77f7ab