Fix committed in product branch r6323. Please test this change and let us know if there are any issues.
Fix committed in product branch r6323. Please test this change and let us know if there are any issues.