Update latest OSLO files

Change-Id: I17844d2bc5f8255833e8a5b3dc9412041de12826
Merge "Update latest OSLO files"