Merge "Don't let NAW.mNetworkInfo escape"