Merged 17047 from trunk.