Bug: 226486181 Test: N/A, dead code removal only Change-Id: I100db518880a7eee402af37f49e416ec61ff8486