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

Change-Id: I83a4e7a31bdcbccdb7d8b98df4fac81c4c599ed3