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

Change-Id: I09312fc9149321df7e5630aed79f369b27bdf002