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