Merge RP1A.191024.001

Change-Id: I0ff01e24f0e81b49c7b414ec524d468f95a146fa