Merge RP1A.200417.001

Change-Id: I7c03ac4bc1d8f19d4be11fb69ac358e014d335b0