Reapply changes from commit aafe90c

Change-Id: I0e39b7765a49924035b564acfc90b61c9a3a52e6
Signed-off-by: Rossella Sblendido