Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313 am: 9a5ec6b4c3 am: d959eb23c5 am: 5df594ca92 am: b2c00418d3 am: c37d5f55a5 am: b028a26af0 am: fa1019952f am: 0dcde5355a am: cdabec640b
am: 2b33d52dde

Change-Id: I869176219a07293830c34a042848faefbe9cb777