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