Merge "Handle Http Live Streaming native exception"