Remove unnecessary clears

This is a followup to Ibb9371ee.

Bug: 33438
Change-Id: I0b39138967f2d29d5e50db0a5990d175fcc81a8e
Merge "Remove unnecessary clears"