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

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