Change-Id: I40f2f94dd07e7b7b10950a0bc4e78227f35046ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>