Merge "Fix in Wifi activity updates" into pi-dev
am: f83e814b18

Change-Id: I7e42a65ef660029ecfc8a3bf17dac7b5beede755