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