Merge AP3A.240530.001

Change-Id: I966a888667a5b9825adfb16ff1940c01e5e07a99