Gerrit not on master

This is my third commit. Should include the 1st also

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