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