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