Bug: 35089332 Bug: 30188076 Test: make checkbuild Change-Id: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21