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