Merge RP1A.200426.001

Change-Id: I2acd82ddf084c52d43596a78fd083ded4748f4a4