Trunk tracking updates to sync to PSOl r3677.

Includes minor additions to test only.

Trunk tracking updates to sync to PSOl r3677.

Trunk tracking update to sync to PSOL r3677

Includes minor additions to test only.
Merge pull request #575 from pagespeed/dec9-trunk-tracking-updates

Trunk tracking updates to sync to PSOl r3677.