Merge RP1A.191031.003

Change-Id: I45dd09328f807e7b01799b16475f8002da02994a