Merge RP1A.191031.003

Change-Id: I444cf1e64198c586763ca7fbe37328525236cc09