Change-Id: I03935715e51777efffea533310a9d775cb676dca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>