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

Change-Id: I010c734a09a798270b5cbfca325e022a2a9ea4fb