Implement Thomas Herve's Gerrit review suggestions

Change-Id: Idf902b2b64f9840ae660e27beea93757a8f7bec8