Changes from Nokia 11.1 release

Change-Id: I97b882f6f77eef3f352e96e86ccf9a88b9d76d5f