Qualify drive label selector to drive tree...return the drive icon to the Cloud Import drop down.

ui/file_manager/file_manager/main.html

Index: ui/file_manager/file_manager/main.html
diff --git a/ui/file_manager/file_manager/main.html b/ui/file_manager/file_manager/main.html
index a00c2ec59a8b9cefb717d28916538ed3d37ecddd..c7174bd322e7acabdbf19bda8afd04de12620374 100644
--- a/ui/file_manager/file_manager/main.html
+++ b/ui/file_manager/file_manager/main.html
@@ -340,13 +340,17 @@
         <core-icon icon="delete"></core-icon>
         <paper-ripple fit></paper-ripple>
       </button>
-      <button id="cloud-import-button" class="icon-button" tabindex="11"
+      <button id="cloud-import-button"
+              class="icon-button manual-display"
+              tabindex="11"
               i18n-values="aria-label:CLOUD_IMPORT_BUTTON_LABEL"
               style='display: none;'>
         <core-icon icon="cloud-queue"></core-icon>
         <paper-ripple fit></paper-ripple>
       </button>
-      <button id="cloud-import-details-button" class="icon-button" tabindex="12"
+      <button id="cloud-import-details-button"
+              class="icon-button manual-display"
+              tabindex="12"
               style='display: none;'>
         <core-icon icon="arrow-drop-down"></core-icon>
         <paper-ripple fit></paper-ripple>
@@ -367,13 +371,7 @@
       <h1>Backup to Drive</h1>
 
       <div id='#open-destination'>
-        <!!--
-          TODO(smckay): Setting volume-type-icon to "drive" breaks
-          functional tests because selection of the drive volume is
-          done using a query that matches this. Need to fix that.
-          See background/test_util.js:105
-        -->
-        <core-icon class="icon volume-icon" volume-type-icon="na">
+        <core-icon class="icon volume-icon" volume-type-icon="drive">
         </core-icon> My Photos
       </div>