Bug: 73250914 Test: make checkbuild Change-Id: I64ad5cb08aeb1e1c5cd2594dc0be1bbb105610f6
Test: build and run manually Change-Id: I6eb7f1a444703e99f592ac9106261f9c6bd90127