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