K 10
svn:author
V 2
kp
K 8
svn:date
V 27
2020-07-24T20:09:52.304557Z
K 7
svn:log
V 240
bridge: Fix mismerges from r360345

In r362650 we merged r360345. This required manual changes due to the
differences in EPOCH macros between head and stable/12, and was done
imperfectly.

This is a direct commit to stable/12.

PR:		248046

END