Bug: 343280252 Test: b/343280252 compile and abtd test Change-Id: I1cbcce4452b149764876643722a0b37a18dc1b46