Merge "[nss_core] Remove temporary fix put in for preventing LSO crash." into banana_n2h