Merge "Fill resolved static fields during class initialization" into lmp-mr1-dev