Merge RP1A.200518.001

Change-Id: I19a881385a36760c7b8cd74f6df9743c7d98bf51