Merge RP1A.191024.001

Change-Id: Ib3a7c2f681d6a6ddb515474be1973faad8a52768