Merge RP1A.191024.001

Change-Id: Ib85c4e8264afd389811eca51c2ce740cff3ad1d6