Merge "ART: Clean up field initialization" am: d66a932d38 am: 891fa2ecd5
am: fd89f8d1df

Change-Id: I69dc3f7509fd2e626df741952a258a745ce7a498