Merge RP1A.191024.001

Change-Id: I0021c70104484b03f8a43e0271fdedfb764822fd