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

Change-Id: Ic45571d000f6b4d5aa49787fabaebed9d9340de5