Merge RP1A.200417.001

Change-Id: I9702cbac65dffe471958468cf679a29c1507e325