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