Change-Id: Ic20b2842b10bf97c721df6d90b2306a813c9ba2a Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>