Merge RP1A.191024.001

Change-Id: I13f94436b76dd0515194ef193f35695fe2cd3cdc