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

Change-Id: Iaf5108f48f89406a9c0371fdbc97f5ad81bda559