Clarify some configuration messages

Change-Id: Ia2e2428522ff67427b89dc0ccbcb68fb83f1cbfd
Merge "Clarify some configuration messages"