Merge RP1A.200426.001

Change-Id: I3700634b2090744ca395f972faacbe35a32c6ec2