Merge "Fix issue #31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev