7021327: Changes for 7020888 included changes to other files in error

Reviewed-by: chegar
6 files changed