Merge RP1A.200428.001

Change-Id: I7d21177ca700340166f5c014f59189597fc95ff3