Change-Id: Idda4a8b674eaabe24de6b2d0c9f7067046d22d70 Reviewed-by: Marco Bubke <marco.bubke@nokia.com>