graduate-oslo-middleware

Change-Id: I09378d5b81c06959de50733140eab63fabf52f2a
Merge "graduate-oslo-middleware"