Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev