Merge "Merge QQ3A.200605.002 into master"

        android:labelFor="@id/user_photo"

        android:inputType="text|textCapWords"

        android:selectAllOnFocus="true"

        android:hint="@string/user_nickname"/>

        android:hint="@string/user_nickname"

        android:maxLength="100"/>

</LinearLayout>

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            style="@style/wifi_item_spinner"

                            android:prompt="@string/please_select_phase2"

                            android:entries="@array/wifi_phase2_entries" />

                            android:prompt="@string/please_select_phase2" />

                </LinearLayout>

                <LinearLayout android:id="@+id/l_ca_cert"