Merge "Fix native_handle leak in CryptoHal" into pi-dev