Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev am: c5bfd5f5a8
am: 8f621c8cfa
am: d9d34f78ab
Change-Id: I0a72326065e797603e1cbc3f133250c5cafe257f
This commit is contained in: