Merge RP1A.191024.001

Change-Id: Ia0cd03ab886f7701c9510bf966168e01e6730531