Merge RP1A.191024.001

Change-Id: Idead6e079b8c832bddf31a105d17d6d42a23357c