Merge "Update wifi enabled state when connected." into pi-dev am: 8a87e9ddd8
am: 1ee437e493

Change-Id: I8465b8e902a525544af886d7453dd9de8b28e480