Picked commits with Jennifer's signoff to master. Doing a little more testing before backporting to supported release series.
Picked commits with Jennifer's signoff to master. Doing a little more testing before backporting to supported release series.