Merge RP1A.200417.001

Change-Id: Idd3f212ff2af651b8a5c4671d3149272d4ab6210