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