A single commit

Change-Id: I602141cd1d37900d42da99d87d88165ff9346b04
Signed-off-by: Pascal Brand <pascal.brand@st.com>