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