Merge RP1A.191024.001

Change-Id: I1cfceb914434a66cb30b67106eb6056df93677be