Sincronizado a 19/09

Change-Id: I1b572f6b272262e32b10bec0da2884f3d7401647