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

Change-Id: Iad4749b9e90499a6385f3ac13299025a7697ee9e