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

Change-Id: Idbd6feb3769317dae0e8832432e5912d93969661