Merge RP1A.191031.003

Change-Id: I4c8b9f72aa3b5530912de598f0356b368cbda8d0