Merge "Fix overflow sanitizer in Visualizer_command." am: 1b97976a69
am: db28de6160

Change-Id: Id8e8263075aa543468f5adcb140fc2d28d8ff1a4