Merge change I7fa1f88b

* changes:
  Fix preloading after https://android-git.corp.google.com/g/35674.