Merge "Updating network info state should return true." into oc-dev am: 703a233b03
am: 3b2ac89b9a

Change-Id: Ie80882f6d119a334065af7728ddda3867b21d4cf