Merge RP1A.191024.001

Change-Id: I1102b9ed0848c8ed23e045005ffa778186a583e3