Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313
am: 9a5ec6b4c3

Change-Id: I9567b9e3dbd3107cb64ae96681fec0ebb775190f