Change-Id: I9df926f64548a5d53382448ca4eef8d428339aa3 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>