Merge "Fix issue #25656837: Static initialization order bug in ArrayMap leading to NPEs"