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