Sync in o.middleware and replace our own

This syncs the above and removes our own code for the request-id.

Bug: #1328840

Change-Id: I00ac021be48439a14681f9090ba3a13113a60429
Merge "Sync in o.middleware and replace our own"