Merge RP1A.191031.003

Change-Id: I4e544630f5f334d43fb88032104f8e9d1be1f828