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