Merge RP1A.200409.001

Change-Id: I85aac98a7636f4d3893f98ed8c781a8b1f3a45bd