Merge RP1A.200414.001

Change-Id: I5e88b7cf7d5667a97d04af55894de160a8e213fe