Merge RP1A.191031.003

Change-Id: I38bbde46333aeb4c48f0fa8f3be2fd1a21c8d1a7