am b0aeeb77: Merge "ART: Follow-up fixes"

* commit 'b0aeeb777f6c2567a9ea038c9442c1df592b7e04':
  ART: Follow-up fixes