Merge RP1A.200501.001

Change-Id: Iad2a91c2d64403acf5cb26ee48b39bc0829b11dd