Clean-up only, no functional change. Bug: 5461416 Change-Id: I272b1456e797f398014a6a4159319e5519fcaf64