Merge "Merge "Prevent a crash when constructing NSSL." into qt-dev am: a9828ff519 am: bba34a3fcf am: 86ec69b6a8 am: d03e2cd28d am: dfc3beda06 am: 16cf063cc9 am: 5a371bbb7f" into sc-v2-dev-plus-aosp