Merge from Oslo-incubator

Change-Id: I2ef3bb9acdfb5bcae574d812e06fd689d0a7c890