sync olso-incubator code

sync up to Change-Id: I52036cf38af6ba2e59e751c2bcb8cd31e37c01de

Change-Id: I107a8f1894dc6adad09cd07e157782cc73da0c40
Merge "sync olso-incubator code"