Merge RP1A.200407.001

Change-Id: I3f4efa678aa708f1486b95a4ca8d152c04c555ec