Merge "ART: Fix uninitialized variable" am: 911542ed69 am: f01e70d214
am: c79558bdab

* commit 'c79558bdab88e532d48748f6e89a1e5997d0845d':