Merge "Put a little space between wifi and data type" into pi-dev
am: 2640b2142e

Change-Id: I4667dca524a67d13fa11f930eda606ed74fc3e89