Merge "Fix overflow sanitizer in Visualizer_command." am: 1b97976a69 am: db28de6160
am: fab170e7ee  -s ours

Change-Id: Ie370e811212f3bfb17a6ba77b785b253745f1cde