Merge RP1A.191024.001

Change-Id: I79f322a6170d9f6e8ebc1850984c9167d4858450