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