Merge RP1A.191031.003

Change-Id: I417b3fb9c10cea8d0c1efc7ffe553504f4250003