Add tooz support from Oslo

Change-Id: I4ccf4bf08e10c0ba651f973aa62562af85ea0f19
Merge "Add tooz support from Oslo"