Sync Oslo and Requirements

Change-Id: I648a81c9ed6f611383d196316291504588279b78