Change-Id: I277d036e9652b5558b5cd39c5a3075af458209e8 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>