am ceb0124c: Merge "Fix race in ART 079-phantom"

* commit 'ceb0124c687e20e63c753fc8abb8b623f2206966':
  Fix race in ART 079-phantom