Change-Id: Ie9447e040c228b42766969ed8d80b33f67cccc46 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>