Merge "Stop using sum(1)."
am: 0614de7055

Change-Id: Ife4657828a81e244f6def14630e5dc5172a664db