Change-Id: I05255b3d06cf08fa2e2744105aa88c8510b0f6ef
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>