Merge RP1A.191024.001

Change-Id: I338e086a06f04354b2696c5839d7adbb5313e5b2