am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread

* commit '65816a32ee2c2181895e3be636f3173a6e769f67':
  Fix the fix for storage ANRs.