This reapplies commit 745e053b. Test: make checkbuild Change-Id: I81220f38b9d7fdede694331e457d88a166c39464