Sync to trunk revision 61757.