Merge RP1A.191024.001

Change-Id: I2d5bb8e6ade997ff63531ad1940a922fc190ef0d