Merge RP1A.200304.001

Change-Id: If7a5be1f48c8cfafa5f89dc40069d3d8061bb045