Sync from Juniper:master.