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

Change-Id: I65fd9c378937f9ce634a679e6779368aa63fc143