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