Rondão changes

Signed-off-by: Rafael Rondao <rafael.rondao@lge.com>