[automerger skipped] Merge "Add DnD as a special case Slice" into pi-dev am: 6dc6462a54
am: 6393e4bcfe  -s ours

Change-Id: I0181444b0286def4faf8dc33454da542c7cc026d