Merge "Fix AssetFileDescriptorTest#testMiscMethod" into jb-dev