Merge \"Fix DND conditional null state\" into nyc-dev
am: 733649c2fa

Change-Id: Icd64312b660dc1c098772f97731241a9c9a6032c