Index: ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
===================================================================
--- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c	(revision 17420)
+++ ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c	(working copy)
@@ -1,7 +1,7 @@
 /** @file
   Provides interface to advanced shell functionality for parsing both handle and protocol database.
 
-  (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
+  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -1010,6 +1010,7 @@
 // PI Spec ones
 //
   {STRING_TOKEN(STR_IDE_CONT_INIT),         &gEfiIdeControllerInitProtocolGuid,               NULL},
+  {STRING_TOKEN(STR_DISK_INFO),             &gEfiDiskInfoProtocolGuid,                        NULL},
 
 //
 // UEFI Shell Spec 2.0
Index: ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
===================================================================
--- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h	(revision 17420)
+++ ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h	(working copy)
@@ -1,7 +1,7 @@
 /** @file
   Provides interface to advanced shell functionality for parsing both handle and protocol database.
 
-  (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
+  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -135,6 +135,7 @@
 #include <Protocol/DiskIo2.h>
 #include <Protocol/AdapterInformation.h>
 #include <Protocol/EfiShellDynamicCommand.h>
+#include <Protocol/DiskInfo.h>
 
 #include <Library/HandleParsingLib.h>
 #include <Library/UefiBootServicesTableLib.h>
Index: ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
===================================================================
--- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf	(revision 17420)
+++ ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf	(working copy)
@@ -1,6 +1,6 @@
 ##  @file
 #  Provides interface to advanced shell functionality for parsing both handle and protocol database.
-#  (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
+#  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
 #  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
 #
 #  This program and the accompanying materials
@@ -173,6 +173,7 @@
   gEfiDiskIo2ProtocolGuid                                 ## UNDEFINED
   gEfiAdapterInformationProtocolGuid                      ## UNDEFINED
   gEfiShellDynamicCommandProtocolGuid                     ## UNDEFINED
+  gEfiDiskInfoProtocolGuid                                ## UNDEFINED
 
 [Guids]
   gEfiFileInfoGuid                                        ## CONSUMES ## GUID
Index: ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
===================================================================
--- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni	(revision 17420)
+++ ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni	(working copy)
@@ -2,7 +2,7 @@
  
  / /   
- / /   ( C )   C o p y r i g h t   2 0 1 3 - 2 0 1 4   H e w l e t t - P a c k a r d   D e v e l o p m e n t   C o m p a n y ,   L . P . < B R > + / /   ( C )   C o p y r i g h t   2 0 1 3 - 2 0 1 5   H e w l e t t - P a c k a r d   D e v e l o p m e n t   C o m p a n y ,   L . P . < B R >   
  / /   C o p y r i g h t   ( c )   2 0 1 0   -   2 0 1 5 ,   I n t e l   C o r p o r a t i o n .   A l l   r i g h t s   r e s e r v e d .   < B R >   
@@ -438,6 +438,8 @@
  
  # s t r i n g   S T R _ I D E _ C O N T _ I N I T                   # l a n g u a g e   e n - U S   " I d e C o n t r o l l e r I n i t "   
+ # s t r i n g   S T R _ D I S K _ I N F O                           # l a n g u a g e   e n - U S   " D i s k I n f o " + 
    
  # s t r i n g   S T R _ P C I R B _ D U M P _ P H                   # l a n g u a g e   e n - U S   "           P a r e n t H a n d l e . . :   % H % x % N \ r \ n " 