Sync to trunk revision 63922.