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