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

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