Bug: 35234379 Bug: 30188076 Test: make checkbuild Change-Id: I3aa9b72393d128877c86c9a116495f76f3e50e18