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