Merge RP1A.200414.001

Change-Id: I5799c64f18b3400c79ed68ec59d2b74ba6604cd9