c43906e2e9
Removing redundant variables, using x *= y instead x = x * y, moving variable declarations into inner blocks. Change-Id: I884f95c755f55d51b7c1c6585f10296919063e41