Bug: b/78034256 Test: m clean && m checkapi Change-Id: Ifbda8825f95e26bb79aac9b1bb73c5e43f12d1fb Merged-In: Ifbda8825f95e26bb79aac9b1bb73c5e43f12d1fb