Merge RP1A.200518.001

Change-Id: I9f52c5f02287dfdfee46a7b900973d3d3497a09e