Merge "Merge "Fix NPE in NSSL test" into qt-dev am: c5e858a2c2 am: d4fd22c948" into qt-r1-dev-plus-aosp
am: e27ef2cfc8

Change-Id: I2617ac8243a95133760de2db07eb965def12fbad