Merge RP1A.200423.002

Change-Id: Ie4acc7a350beed54e036c5bdfd1743c48eafe562