Merge "Merge "Fixed how ShellCommand show exceptions." into rvc-dev am:...
Merge "Merge "Fixed how ShellCommand show exceptions." into rvc-dev am: 725f9cea am: 31701635" into rvc-d1-dev-plus-aosp am: f926f30b
Change-Id: I95c3d3b15a621af6828bccd72f44636040ebfe01