Merge "OMS: limit shell command output via optional args" into qt-dev
am: c283f6100d

Change-Id: I0cf89a970bbbbfac0fb5dafbcc8a35f834d2d63c