Merge RP1A.200518.001

Change-Id: If360ee94f10b2c79607846380ee37a5021dd7e47