Merge RP1A.200123.001

Change-Id: I92572f06ba3312bd4405d1451f4ecc1aa40b562c