Merge "Do not assume the dex cache is already populated."
am: 7b829f6b83

* commit '7b829f6b8390535172bba3496b8bf6275d3c26a6':
  Do not assume the dex cache is already populated.