Consistency updates for commandline scripts

Change-Id: Ibdf353456e42570a0cb4f00e84329d083e0b06eb
Merge "Consistency updates for commandline scripts"