Merge RP1A.200507.001

Change-Id: I2010ccbc7f079a5082c8bfe689228cecf85fe7f1