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

Change-Id: I646e7d8abd4e3b8ac7b3ae5dcc9d19827f7b322f