Merge RP1A.200504.002

Change-Id: I269d3629b1706a740a55e953b79f83366ae4bc0e