Merge RP1A.200123.001

Change-Id: I4f086db016a23bcc778226d706b92d228d15ca37