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