Merge "Add getFileDescriptor$() method for testing"