Merge RP1A.200123.001

Change-Id: If871b4e32c102793588a0dbf5ac04cd28b09263b