Change-Id: Ifa0bc37916d3ac3a523580bec15a6685709e7810 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>