Merge RP1A.191031.003

Change-Id: I4eecde550a9d8ae3a5c8e2a0789edeeaaaa21606