* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516