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

Change-Id: Iba8a4f4447f4c70da0d466eaa824a24a6488a975