Merge "Fix NPE in NSSL test" into qt-dev
am: c5e858a2c2

Change-Id: Ib11af6d9576182898983b3324b556bf5d3ccc5b8