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