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