Change-Id: I8284707c92221560115f2b5e4428b42013094cc6
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>