Merge RP1A.200407.001

Change-Id: I83e01ba31bc59987fd337b9408c840419746187f