Merge remote branch 'cros/upstream' into tempbranch

client/tests/kvm/unattended/win7-32-autounattend.xml

 <?xml version="1.0" encoding="utf-8"?>
 <unattend xmlns="urn:schemas-microsoft-com:unattend">
         <settings pass="windowsPE">
                 <component name="Microsoft-Windows-International-Core-WinPE"
                         processorArchitecture="x86" publicKeyToken="31bf3856ad364e35"
                         language="neutral" versionScope="nonSxS"
                         xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"
                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                         <SetupUILanguage>
                                 <UILanguage>en-us</UILanguage>
                         </SetupUILanguage>
                         <InputLocale>0409:00000409</InputLocale>
                         <SystemLocale>en-us</SystemLocale>
                         <UILanguage>en-us</UILanguage>
                         <UILanguageFallback>en-us</UILanguageFallback>
                         <UserLocale>en-us</UserLocale>
                 </component>
                 <component name="Microsoft-Windows-PnpCustomizationsWinPE"
-                        processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35"
+                        processorArchitecture="x86" publicKeyToken="31bf3856ad364e35"
                         language="neutral" versionScope="nonSxS"
                         xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"
                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
                         <DriverPaths>
                                 <PathAndCredentials wcm:keyValue="1" wcm:action="add">
                                         <Path>KVM_TEST_STORAGE_DRIVER_PATH</Path>
                                 </PathAndCredentials>
                                 <PathAndCredentials wcm:keyValue="2" wcm:action="add">
                                         <Path>KVM_TEST_NETWORK_DRIVER_PATH</Path>
                                 </PathAndCredentials>
@@ skipping 119 matching lines @@
                                 </SynchronousCommand>
                                 <SynchronousCommand wcm:action="add">
                                         <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
                                         <Order>4</Order>
                                 </SynchronousCommand>
                                 <SynchronousCommand wcm:action="add">
                                         <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
                                         <Order>5</Order>
                                 </SynchronousCommand>
                                 <SynchronousCommand wcm:action="add">
+<<<<<<< HEAD
                                         <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
                                         <Order>6</Order>
                                 </SynchronousCommand>
                                 <SynchronousCommand wcm:action="add">
                                         <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
                                         <Order>7</Order>
                                 </SynchronousCommand>
                                 <SynchronousCommand wcm:action="add">
                                         <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 &#38;&#38; A:\finish.exe</CommandLine>
                                         <Order>8</Order>
                                 </SynchronousCommand>
+=======
+                                        <CommandLine>%WINDIR%\System32\cmd /c bcdedit /set {current} bootstatuspolicy ignoreallfailures</CommandLine>
+                                        <Order>6</Order>
+                                </SynchronousCommand>
+                                <SynchronousCommand wcm:action="add">
+                                        <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
+                                        <Order>7</Order>
+                                </SynchronousCommand>
+                                <SynchronousCommand wcm:action="add">
+                                        <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
+                                        <Order>8</Order>
+                                </SynchronousCommand>
+                                <SynchronousCommand wcm:action="add">
+                                        <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 &#38;&#38; A:\finish.exe</CommandLine>
+                                        <Order>9</Order>
+                                </SynchronousCommand>
+>>>>>>> cros/upstream
                         </FirstLogonCommands>
                 </component>
         </settings>
         <cpi:offlineImage cpi:source="wim:c:/install.wim#Windows Longhorn SERVERSTANDARD"
                 xmlns:cpi="urn:schemas-microsoft-com:cpi" />
-</unattend>
+</unattend>