Change-Id: Ie8838bc809b683a4d1d96360dc0bf8f33233f56b Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>