Merge "Add DnD as a special case Slice" into pi-dev
am: 6dc6462a54

Change-Id: I8f6260380bb7241ebce956ff2772f7e6ee0218b6