Change-Id: If5389209dad8dbd4c78d9faff41323ae3218cd78 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>