Merge "Fix race condition in NsdManagerTest" am: f2383db747
am: 2dfb494827

Change-Id: Id2036620f3780aca340470d03b3c579ed3e1e9b7