7042550: Reintegrate 6569621

Reviewed-by: chegar, alanb
6 files changed