Merge RP1A.191024.001

Change-Id: I3603c8365b350cfb1e644fe30d7eaa3c5f71bb04