sync oslo

sync to Ia1bfa1bd24989681db1d2f385defc12e69a01f8d

Change-Id: Idbbbb9fcec8e8b0d1930956850b1a7371081b632
Merge "sync oslo"