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