Merge "Return correct error code from IMediaHttpConnection" into mnc-dev