Ix 9.19.5 cr 179513

@rkreich  - please review.