Merge RP1A.200518.001

Change-Id: I0e4b75ec075f062f8fc797a6096d9f10b8e97c2b