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

Change-Id: I4084ea05f6be2209ed6f977bcf4579edbfaabb3f