Add dnd conditional

Change-Id: I81eabf274bde05358c60bb63e1ed6d1bd447ce55
5 files changed