Merge "Fix wifi launch intent" into pi-dev am: 7f50a0c837
am: 23ba6152aa

Change-Id: Ic1a1156ba8f05ca8ffeb19cae05c871b45d9c293