Merge RP1A.191031.003

Change-Id: Ie1c30cb3e2d7bfe83af114dec5687f20946f310f