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

Change-Id: I31607c4f59aa1e6f64966a021cf13b0be7deb5db