berry-pick: code style fix