Bug: 295394788 Test: make checkbuild Change-Id: I82d6899d8c15a10b15399c39177290012bb5f13b Merged-In: I82d6899d8c15a10b15399c39177290012bb5f13b