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