Merge RP1A.200423.002

Change-Id: I62bcad14dcdebe460314ce46dabca1e40a49a626