Merge RP1A.200123.001

Change-Id: Idf962b0ec35a25d1e084c9a4830d81948bfa3b50