Merge AP3A.240530.001

Change-Id: I171c34bb73c8c3933a552836ecc558b85ffa402f