trunk-tracking: update from r3895 to r3924
Merge pull request #659 from pagespeed/jud-trunk-tracking

trunk-tracking: update from r3895 to r3924