Merge from private, Crashlytics-enabled branch.