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