Fix problem with message-file option

Fix problem with message-file option where the message-file option
has 4 dashes instead of 2.

Change-Id: Iee4a2012d57189f7def6919552c614bbd6168ed6
Partial-Bug: 1348934